From: Raspbian kernel package updater <root@raspbian.org>
Date: Sun, 23 Jul 2017 01:54:02 +0000 (+0000)
Subject: merge rpi changes with packaging
X-Git-Tag: archive/raspbian/4.9.30-2+deb9u2+rpi1~5
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=73542ae29dc58e8415d61ff965bc8134c2d22e97;p=linux-4.9.git

merge rpi changes with packaging
---

73542ae29dc58e8415d61ff965bc8134c2d22e97
diff --cc arch/s390/kernel/entry.S
index 91644f78687c,3bc2825173ef..a74ca0fc6bf9
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@@ -257,8 -263,12 +262,10 @@@ sie_exit
  	stg	%r14,__SF_EMPTY+16(%r15)	# set exit reason code
  	j	sie_exit
  
- 	EX_TABLE(.Lrewind_pad,.Lsie_fault)
+ 	EX_TABLE(.Lrewind_pad6,.Lsie_fault)
+ 	EX_TABLE(.Lrewind_pad4,.Lsie_fault)
+ 	EX_TABLE(.Lrewind_pad2,.Lsie_fault)
  	EX_TABLE(sie_exit,.Lsie_fault)
 -EXPORT_SYMBOL(sie64a)
 -EXPORT_SYMBOL(sie_exit)
  #endif
  
  /*
diff --cc scripts/Makefile.dtbinst
index 15c503f6792b,ad8dc1c93d04..344ca1c2412c
--- a/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst
@@@ -33,9 -34,9 +34,9 @@@ dtbinst-dirs	:= $(dts-dirs
  quiet_cmd_dtb_install =	INSTALL $<
        cmd_dtb_install =	mkdir -p $(2); cp $< $(2)
  
 -install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj))
 +install-dir = $(patsubst $(dtbinst_root)%,$(INSTALL_DTBS_PATH)%,$(obj))
  
- $(dtbinst-files) $(dtbinst-dirs): | __dtbs_install_prep
+ $(dtbinst-files) $(dtboinst-files) $(dtbinst-dirs): | __dtbs_install_prep
  
  $(dtbinst-files): %.dtb: $(obj)/%.dtb
  	$(call cmd,dtb_install,$(install-dir))